Now includes buffer